Skip to content

[release-branch.go1.25] Restore go1.25.14 - #2721

Merged
Davis Goodin (dagood) merged 1 commit into
microsoft/release-branch.go1.25from
dev/dagood/restore-1.25
Nov 11, 2026
Merged

Davis Goodin (dagood) merged 1 commit into
microsoft/release-branch.go1.25from
dev/dagood/restore-1.25

Conversation

@dagood

@dagood Davis Goodin (dagood) commented Nov 11, 2026 •

Copy link
Copy Markdown
Member

This puts the branch in a good state to develop a future 1.25 build, if necessary.

@dagood
Davis Goodin (dagood) requested a review from a team as a code owner November 11, 2026 18:43
Copilot AI balanced review requested due to automatic review settings November 11, 2026 18:43
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
There may be pipelines that require an authorized user to comment /azp run to run.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

The go submodule remains pinned to go1.25.6 despite the VERSION change, so clean checkouts use outdated source against which the restored vendor patch will fail to apply.

1 open issue
What changed in this PR

Partially reverts #2702 to prepare the Go 1.25 release branch for possible future builds, while retaining patch-index tracking for conflict resolution.

Changes:

  • Restores VERSION to go1.25.14 and adjusts patches for the newer source.
  • Removes the SMTP certificate and CNAME test backports.
  • Refreshes patch checksums and retained index metadata.
File Description
VERSION Restores the declared version to go1.25.14.
patches/​index.json Updates patch metadata and removes deleted patch entries.
patches/​0016-net-fix-TestLookupCNAME.patch Removes the CNAME test backport.
patches/​0015-net-smtp-prevent-test-failures-due-to-expired-test-c.patch Removes the SMTP certificate test backport.
patches/​0011-Implement-ms_tls_config_schannel-experiment.patch Refreshes Schannel patch context and index lines.
patches/​0004-Use-crypto-backends.patch Refreshes crypto-backend patch context and index lines.
patches/​0001-Vendor-external-dependencies.patch Aligns vendor patch context with newer upstream dependencies.

Review effort: Balanced

Comment thread VERSION Resolved
@dagood
Davis Goodin (dagood) enabled auto-merge (squash) November 11, 2026 19:01
@dagood
Davis Goodin (dagood) merged commit ad4b81a into microsoft/release-branch.go1.25 Nov 11, 2026
32 checks passed
@dagood
Davis Goodin (dagood) deleted the dev/dagood/restore-1.25 branch November 11, 2026 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants